Repository navigation
refactor(ui): QueryaDropdown and QueryaDialogCard off shadcn - #1415
Merged
Merged
Conversation
…adcn Add QueryaThemeColorScheme (the type of QueryaTheme.colorScheme) so widgets can name the scheme without the UI library, and a surface radius token for the dialog card (14, the value shadcn's radiusXxl gave). Both files leave the shadcn allow-list. Part of #1365.
…ueryaThemeScope Widgets in tests and dialogs can be built under the UI library's theme without a QueryaThemeScope; context.queryaTheme asserts there. context.colors is the same scheme the old code read.
3 tasks
ZhuchkaTriplesix
deleted the
issue/1365-dropdown-dialogcard-off-shadcn
branch
October 11, 2026 15:03
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Part of #1365 (does not close it)
Third migration under the ratchet guard (#1409), next to #1412 and #1413. Two more kit files stop importing
package:shadcn_flutterand leave the allow-list in the same change.querya_dropdown.dartTheme.of(context).colorScheme,ColorSchemein parameterscontext.queryaTheme.colorScheme,QueryaThemeColorSchemequerya_dialog_card.dartTheme.of(context).colorScheme,Theme.of(context).radiusXxlcontext.queryaTheme.colorScheme,QueryaControlMetrics.surfaceRadiusQueryaThemeColorSchemeis atypedefofQueryaTheme.colorScheme's type inquerya_theme.dart(which already imports the UI library), so widgets can name the scheme without importing it. When the scheme itself moves to our own type, this one line changes.surfaceRadius = 14replaces shadcn'sradiusXxl, which is0.58 * 24 * density scale= 13.92 with the app's theme, so the dialog corners are the same to a fraction of a pixel. It is not scaled byuiScale, as before.Conflicts
The allow-list lines here neighbour those of #1412 and #1413; whichever merges later needs a trivial merge of that file.
Remaining on the allow-list
app_toast(shadcn's toast overlay: needs our own),export_menu_button, and the ones that need a button:querya_action_button,querya_action_menu,querya_empty_state,querya_modal_dialog; plus thewidgets.dartbarrel.Not run locally; CI is the check.